build: Stop detecting features automatically

Auto-detect options add some convenience for platforms where a
particular feature isn't available - systemd on non-Linux OS comes
to mind - but the downside is that it is easy to accidentally build
without a desired feature. We consider the latter much more serious
nowadays, so turn our auto-detect options into regular boolean
options.

https://bugzilla.gnome.org/show_bug.cgi?id=791007

diff --git a/meson.build b/meson.build
index b0b6e9b4e92a99e018b15cb060465e1979c3e0ab..988fcb749e2d4bfef386a2b690700c8c318ff960 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -102,39 +102,19 @@ if enable_recorder
 endif
 
 nm_deps = []
-enable_networkmanager = get_option('networkmanager')
-if enable_networkmanager != 'no'
-  want_networkmanager = enable_networkmanager == 'yes'
-
-  nm_deps += dependency('libnm-glib',
-    version: nm_req, required: want_networkmanager
-  )
-  nm_deps += dependency('libnm-util',
-    version: nm_req, required: want_networkmanager
-  )
-  nm_deps += dependency('libnm-gtk',
-    version: nm_req, required: want_networkmanager
-  )
-  nm_deps += dependency('libsecret-1',
-    version: secret_req, required: want_networkmanager
-  )
+if get_option('networkmanager')
+  nm_deps += dependency('libnm-glib', version: nm_req)
+  nm_deps += dependency('libnm-util', version: nm_req)
+  nm_deps += dependency('libnm-gtk', version: nm_req)
+  nm_deps += dependency('libsecret-1', version: secret_req)
 
   have_networkmanager = true
-  foreach dep : nm_deps
-    have_networkmanager = have_networkmanager and dep.found()
-  endforeach
-
-  if not have_networkmanager
-    nm_deps = []
-  endif
 else
   have_networkmanager = false
 endif
 
-enable_systemd = get_option('systemd')
-if enable_systemd != 'no'
-  want_systemd = enable_systemd == 'yes'
-  systemd_dep = dependency('libsystemd', required: want_systemd)
+if get_option('systemd')
+  systemd_dep = dependency('libsystemd')
   have_systemd = systemd_dep.found()
 else
   systemd_dep = []

diff --git a/meson_options.txt b/meson_options.txt
index c6a9e550e9cf7ca8d0cf726105f1205bac274a53..65188c7ff3f2ddae8abc6640a23ece74fb418032 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,15 +17,13 @@ option('man',
 )
 
 option('networkmanager',
-  type: 'combo',
-  choices: ['yes', 'no', 'auto'],
-  value: 'auto',
+  type: 'boolean',
+  value: true,
   description: 'Enable NetworkManager support'
 )
 
 option('systemd',
-  type: 'combo',
-  choices: ['yes', 'no', 'auto'],
-  value: 'auto',
+  type: 'boolean',
+  value: true,
   description: 'Enable systemd integration'
 )